Small fixes and checks