Bug fixes at prior work