Fix some issues with related to edx/master changes