fix misc issues