Making 5.4 complaint and ready for droplet hosting.