Minor fixes

fixes #1308
also improves checking for #2706