fixed more problems after last megamerge(tm)