MEDIUM: Attempt to fix a few issues