Fixed some visibility timing issues.