CyanDream changes and fixes