Making some manual fixes to make stuff play nice :)