Mac fixes and better error rendering