Small updates

Should fix #1 thanks to your recent changes. Builds properly, thanks! Gives some hope to mono.