Multiple changes: changes in build system, one workaround and one bug fix