Fixes for questionable function syntax