(small) bug fixes from bleedingedge