Some changes for SeaFox 0.2