Bugfixes, use errors instead of status args