Seems like all fixes works fine