Closes #43 nightly fixes