Fixes for some odd behaviors