PropertyChange fixes