Kinda more fixes from Simply