Fix signatures, simplify some methods