Final changes, removed warnings etc