fixed inline funcs, compiles with -Werror now