* Smaller fixes