Fixes for last commit. Sorry.