Buzz page fixes for DEVELOPER-404 and DEVELOPER-478