Minor typs fixes and changes