[PATCH] two small patches