Small fixes before initial deploy