Fixes for SDCC & code style