Fixed multiple thunked bugfixes