Some fixes (non-functional)