some bug fixes after HSC install