bs061414: Misc tweaks