Fix Obelisk too.
A few more fixes.
Message!