Removed warnings etc...