A few more fixs