Fixes

Fixes unchecked code warnings