Fixed stuff Gabriel broke