Remove some warnings, many others still remain :(