Fixing SOA bucket directories