Bug fixes with sub directories