Misc. bug fixes noticed when updating the RCUE theme from this one