Move some flags around