Fix some first look problems