Some small changes + fence lag fix