EDX-502: Fix some