[PATCH] fixes for master