WIP - fixes