Fixes for issues