Some fixes highlighed when implementing Python version.