[COMMIT] Tyan Guiness fixes