Fixed most the warnings in Universe.