Added more code fixings.