Flappy

A few pretty simple flappy related fixes