[PATCH] Warnings/const fix