Fixed chrome problem and minor fixes