Cleanups of old styles, fixes for issues