Improve deployment performance

@devcritter and another small one...