small changes to fix misc stuff