First Release Minor bug fixes