Initial commit contd.

- compilation fixes