some more "fixes"... I hope