A few things fixed