Small changes based on warnings from plugins