bs3 + fa4 fixes
Merge pull request #1151 from stevewithington/develop

bs3 + fa4 fixes