More updates to work in appHarbor