Fixed missing stuff
Fixed missing stuff