minor bug tweaks