Fixes for odd behaviors