Small fixes EVERYWHERE