Fix bugs found while testing