Remove warnings & use framework builtins