* Fixed some previous fixes