Modifications to resolve issues

Signed-off-by: Ben Merrell <ben@digitalboutique.co.uk>