Small changes to remove some annoying bugs