Cleared some annoying bugs