Fixes for @Dashron comments