fixed build and release issues