Functional fixes/cleanup