Some small fixes related to last 2 updates