Silly bugs, few more to go before compiling