Fixes for 5 issues