More initial bug fixes