various fixes: cap deploy stuff