Fixing little bugs