Bug fixes (4/36)

Bug fixes