[PATCH] Another batch of initial setup related patches