Fixes remaining issues with #144