Minor cleanup of build