Changed some magic __get method calls to accessors, were throwing notices