(HatCat/angrylion) Fix up some function signatures