Adding fixes for observable window