Fixed some aspect issues