[src] More bug fixes