Plugin checks and some minor changes