Fixed bugs for building exposure calculations

2 jobs for master in 1 minute and 51 seconds (queued for 2 seconds)