little fixes for BSA