Fix minors issues