Couple fixes
Removing unnecessary guard