fixes for windows branch build failures under linux. still does not build on linux, now due to taglib changes