Fixes two issues found during stabilizer run