Fix: incorrect return type and incorrect integer types

Fix: incorrect return type and incorrect integer types #927