Fix worker AMI name
Code cleanups and minor fixes