Fixes based on src_check