Update, fixed 4.3 issues