Continued fixes