Minor startup improvements