some fixes, not sure what they are