Minor changes & MySQL issues