Updates firmware

Minor changes.
Wrong merge fix.