fixed linker and SC issues