some changes to make it compile on parallella