Small details fixes