Code

Fixing some warnings/errors