Last minute bugfixing!