Small fixes
add caching an alanache warnings