Fixes for most issues