Fixes for better workflow