Fix improper returns