Super bug fix updates