Fixing call possibility
Removing some warnings