Bugfixes (thank you, error reporting in Blaze)