New fixes (not ready for merge yet)