Fix some signatures and simplify methods