Fixed stuff hopefully