Small fixes, removed some warnings