3.0.8 updates

Signed-off-by: Luke Oatham <lukeoatham@gmail.com>