0.6.10 * Misc bug fixes