view change fixes