Fixed some minor issues with the codebase.