fix simple stuff