A few minor fixes still doesn't work
Few fixes