more complete fixes