Some minor bug fixes (Editor side mostly)