Fixed inlines and shit

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>
Minor fixes

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>