Fixed GA bugs