fixes for broken builds. Thank you jnettlet