Fixed mutators which are now fully implemented.