Fixes warning issues