Soem minor updates