Small bug fixes.
More minor tweaks