Fooling around with bugmuncher
Fixes for EC2 server
Have to merge though technically this is a fast-forward