Smaller fixes, nothing mayor