Some more changes to the PC class.