fixes for serial compilation