Fixed uint bug and corrected interfaces