Fix center calculation
Misc