Bug fix and build to all supported platforms