Fixes to glimmer so it compiles