Fixed compiler errors, sorry for that