Stil fixing bugs