Some pointless fixes