Some small changes while messing around