Fixed issue: More minor fixes