Alpha fixes for #3 and #18