Fixes and automation