Fixed bugs that came with the port