MIsc fixes