Smaller fixes and additions