Making Caelestis compile and run!
Fixing function for different units