Various typofixes