Small changes

A bit safer this way