BUG fixes!

Signed-off-by: Adam Palmer <ad@palmerama.tv>