More wercker fixes