Change version to 11.4 and small fix