Removed some warnings

+ fix for previous commit