Fixing two NPEs
Fixing build