Fixes requested by ayes