Fixing bugs. TODO: create cluster copies for apps