Fixed some visibility issues