subtle fixes