woo more fixes