Fixes, simplifications