Fixed the issues reported on https://github.com/marcore/edx-platform/pull/1