Fixed build and build:dist tasks