fixes for the static version