Fixes for resampler module