Verious silly compilation fixes, nothing to see here..