[SRC] Minor bug fixes